fix-system-lpsolve-build

Gbp-Pq: Name fix-system-lpsolve-build.diff

diff --git a/configure.in b/configure.in
index 90ce592beccfb87c6792309bb59ba48a7dc18b5c..ad16f8474ae62b2e7912492f07cd8acdf2deaec1 100644 (file)
Binary files a/configure.in and b/configure.in differ

diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index ba9493a4d68b9c9ae0f32b3f803662ea22fb9574..6c08291c3663689baa5330a8562a9d2e2826d5f0 100644 (file)
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -49,7 +49,13 @@ $(eval $(call gb_Library_add_linked_libs,solver,\
        $(gb_STDLIBS) \
 ))
 
+ifeq ($(SYSTEM_LPSOLVE),YES)
+$(eval $(call gb_Library_add_ldflags,solver, \
+       /usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
+))
+else
 $(eval $(call gb_Library_use_external,solver,lpsolve55))
+endif
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
        sccomp/source/solver/solver \

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 12db54a70e17afb459336bd49f3bdac1d1abbbcb..45d61c3a8ffcef6b6dbf3c8f8e303c4ab7a72253 100644 (file)
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -310,7 +310,13 @@ MYTHESLIB=$(MYTHES_LIBS)
 MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
+.IF "$(SYSTEM_LPSOLVE)" == "YES"
+# FIXME. Even with -L/usr/lib/lp_solve -llpsolve55 the liblpsolve55.a from
+# /usr/lib gets picked and we get a static link...
+LPSOLVELIB = /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve
+.ELSE
 LPSOLVELIB=-llpsolve55
+.ENDIF
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest